ti: k3: Migrate to new interfaces

- Migrate to bl31_early_platform_setup2().
- Remove references to removed build options.

Change-Id: Ie9f149e3fdec935f9329402ed3dd8e1c00b8832c
Acked-by: Andrew F. Davis <[email protected]>
Signed-off-by: Antonio Nino Diaz <[email protected]>

diff --git a/plat/ti/k3/common/k3_bl31_setup.c b/plat/ti/k3/common/k3_bl31_setup.c
index 2d4d1c2783e7aa651fb29806a1ae3cd50405cbde..f84b9d4490d187383a065ad908533d4929cb18f6 100644 (file)
--- a/plat/ti/k3/common/k3_bl31_setup.c
+++ b/plat/ti/k3/common/k3_bl31_setup.c
@@ -57,12 +57,12 @@ static uint32_t k3_get_spsr_for_bl33_entry(void)
  * Perform any BL3-1 early platform setup, such as console init and deciding on
  * memory layout.
  ******************************************************************************/
-void bl31_early_platform_setup(bl31_params_t *from_bl2,
-                              void *plat_params_from_bl2)
+void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
+                               u_register_t arg2, u_register_t arg3)
 {
        /* There are no parameters from BL2 if BL31 is a reset vector */
-       assert(from_bl2 == NULL);
-       assert(plat_params_from_bl2 == NULL);
+       assert(arg0 == 0U);
+       assert(arg1 == 0U);
 
        bl31_console_setup();
 
@@ -95,12 +95,6 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
 #endif
 }
 
-void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
-                               u_register_t arg2, u_register_t arg3)
-{
-       bl31_early_platform_setup((void *)arg0, (void *)arg1);
-}
-
 void bl31_plat_arch_setup(void)
 {
 

diff --git a/plat/ti/k3/common/plat_common.mk b/plat/ti/k3/common/plat_common.mk
index 446d8afba2b8d6af68095458043ebafb3cbe5158..31481785d6c277e551d5cc8bfa75a90ba0f504c5 100644 (file)
--- a/plat/ti/k3/common/plat_common.mk
+++ b/plat/ti/k3/common/plat_common.mk
@@ -15,9 +15,6 @@ PROGRAMMABLE_RESET_ADDRESS:=  1
 WARMBOOT_ENABLE_DCACHE_EARLY:= 1
 USE_COHERENT_MEM       :=      0
 
-ERROR_DEPRECATED       :=      1
-ENABLE_PLAT_COMPAT     :=      0
-
 # A53 erratum for SoC. (enable them all)
 ERRATA_A53_826319      :=      1
 ERRATA_A53_835769      :=      1